auto upstream
authorJoakim Verona <joakim@verona.se>
Tue, 26 Mar 2013 23:05:52 +0000 (00:05 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 26 Mar 2013 23:05:52 +0000 (00:05 +0100)

Trivial merge